Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consul pull ⬇️ #886

Merged
merged 32 commits into from
Sep 22, 2017
Merged

Consul pull ⬇️ #886

merged 32 commits into from
Sep 22, 2017

Conversation

bertocq
Copy link

@bertocq bertocq commented Sep 20, 2017

Where

Related PR's:

What

  • Pulling latest changes from Consul on to Madrid's fork

How

  • Merging conflicts manually

Screenshots

  • No need

Test

  • There should be less flaky tests, lets hope Travis is nice this time

Deployment

  • As usual to preproduction as a feature branch to test before merge

Warnings

  • Mostly fixes, should check manually

Senen and others added 30 commits September 11, 2017 14:39
Fixes #1848

On branch aperez-fix-for-issue-1848
  Changes to be committed:
    new file:   app/controllers/admin/poll/base_controller.rb
    modified:   app/controllers/admin/poll/booth_assignments_controller.rb
    modified:   app/controllers/admin/poll/booths_controller.rb
    modified:   app/controllers/admin/poll/officer_assignments_controller.rb
    modified:   app/controllers/admin/poll/officers_controller.rb
    modified:   app/controllers/admin/poll/polls_controller.rb
    modified:   app/controllers/admin/poll/questions_controller.rb
    modified:   app/controllers/admin/poll/recounts_controller.rb
    modified:   app/controllers/admin/poll/results_controller.rb
    modified:   app/controllers/admin/poll/shifts_controller.rb
…ere was a link for it, but no icons. The CSS file "theme" from jquery-ui was missing.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	nuevo archivo: app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
Fixes #1831

On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   app/models/poll/question.rb
    modified:   spec/models/poll/question_spec.rb
    modified:   spec/features/admin/poll/polls_spec.rb
…of consul instead of icons from jquery-ui.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	borrado:       app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
…t-m2c/consul into iagirre-display-datepicker-arrows
… open. Moreover, when "Site custom" submenus are selected, the menu remains opened.
On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   spec/models/poll/question_spec.rb
…on-is-selected

Validate presence 'poll_id' attribute on Poll::Question model
…-active-items

When "Profiles" submenus are selected, the "Site custom" menu doesn't…
…arrows

Iagirre display datepicker arrows
Poll::Questions now have a validation for a `poll_id`
Useful if you want to test the verification process.
Add base controller for Admin:Poll controller
Switch flag/unflag buttons on use via ajax
@bertocq bertocq changed the title Consul pull Consul pull: The Fixes edition 🛠 Sep 20, 2017
@bertocq bertocq changed the title Consul pull: The Fixes edition 🛠 Consul pull ⬇️ Sep 22, 2017
@bertocq bertocq merged commit 50b3942 into master Sep 22, 2017
@bertocq bertocq deleted the consul_pull branch September 22, 2017 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants